* (bug 18121) maintenance/deleteArchivedRevisions.php no longer deletes revisions...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4ef8d69..d2fde79 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -352,6 +352,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   <strong> instead of hardcoded styles
 * (bug 18449) Fixed items number per column on category pages when the total is
   divisible by 3
+* (bug 18121) maintenance/deleteArchivedRevisions.php no longer deletes
+  revisions when --delete is not passed
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions

diff --git a/maintenance/deleteArchivedRevisions.inc b/maintenance/deleteArchivedRevisions.inc
index 67e4c5a..3cfa614 100644 (file)
--- a/maintenance/deleteArchivedRevisions.inc
+++ b/maintenance/deleteArchivedRevisions.inc
@@ -18,17 +18,24 @@ function DeleteArchivedRevisions( $delete = false ) {
        
        $tbl_arch = $dbw->tableName( 'archive' );
        # Delete as appropriate
-       echo( "Deleting archived revisions..." );
-       $dbw->query( "TRUNCATE TABLE $tbl_arch" );
-       echo( "done.\n" );
-       
-       $delete = $dbw->affectedRows() != 0;
-       
-       # This bit's done
-       # Purge redundant text records
-       $dbw->commit();
+       echo( "Deleting archived revisions... " );
+
        if( $delete ) {
-               PurgeRedundantText( true );
-       }
+               $dbw->query( "TRUNCATE TABLE $tbl_arch" );
+       
+               $count = $dbw->affectedRows();
+               $deletedRows = $count != 0;
+
+               echo( "done. $count revisions deleted.\n" );
 
+               # This bit's done
+               # Purge redundant text records
+               $dbw->commit();
+               if( $deletedRows ) {
+                       PurgeRedundantText( true );
+               }
+       } else {
+               $res = $dbw->selectRow( 'archive', 'COUNT(*) as count', array(), __FUNCTION__ );
+               echo( "done. {$res->count} revisions to delete.\n" );
+       }
 }